Merge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev am: 11619f47
am: 845996e3
* commit '845996e3':
Fixed a bug where the content height was wrong
Fixed the fade in animation when coming from dark
Fixed the animation when flinging over the bottom stack
Change-Id: I2e0f53f7ddb30f9cdb91dec89a0998951a587b4c