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

Change-Id: Ibc824f43a6c6035be2c3e980191f53af60ddd0b4