Merge \"Fix shade background not aligning with bottom of a group\" into nyc-dev
am: 4f9404f6f2

Change-Id: Id157e63ed4950f422b7cfefbbb2c4a589a70dd3d