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

Change-Id: Id6a66407454173a44cb83eefd96ac44dbd74ce88