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

Change-Id: I190ae94014df9d17ca98174e55f64afe54850a42