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

Change-Id: I3de7a76bb6d27c30903521865cfaee50135d8787