Merge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev am: 11619f47 am: 845996e3

am: 5023dc6e

* commit '5023dc6e':
  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: I70f088c0f187c387444ab73a451ac32f32033a04