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

Change-Id: Iff68d2db9b83b7f43524a39e280463b8462f5f00