Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c am: b076ee0a" into nyc-mr1-dev-plus-aosp