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

Change-Id: Ia4f666933ca1c090a660cd2e47ca3534b1e6e000