Merge "Make RemoteView margins density-change safe" into nyc-dev