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

Change-Id: I50aab94c497af12a3f2d3522425ddd850c2e3793