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

Change-Id: I5b9ee75c66316067b9ba04e46e63e86cc11a41f9