Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
am: ba38cc6992

Change-Id: I4ebb82d1c22f61c550f5aae967c75940812c4260