Merge \\"Fix scrolling view position with fitSystemWindows parent\\" into nyc-dev am: 1082886555
am: 736c426dcf

Change-Id: Ie3647a9cfdf0bd3f54cd3c6229a860608b66d0e8