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

Change-Id: I2f59abdfcfd28876995b98b13ce15a40d601ca3f