Merge "Fix scrolling view position with fitSystemWindows parent" into nyc-dev