Merge "Fix calculation of content insets" into nyc-dev