Merge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev

am: 11619f47

* commit '11619f47':
  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: I93685370f491d0c049b81957a1f09f680a2f2b65