Merge "Override addViewInLayout to apply scale factor" into nyc-dev