Merge \\\"Fix shade background not aligning with bottom of a group\\\" into...
Merge \\\"Fix shade background not aligning with bottom of a group\\\" into nyc-dev am: 4f9404f6 am: f811b512
am: 2d6e7149
Change-Id: I8b880a95c0af5a23d5a0ecb54c9569be490c15c7