Merge "Light grey some View APIs." into pi-dev
am: 854c050ccb

Change-Id: Iba28e31113c4f23727db00860fddf2cdf3c791e6