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

Change-Id: I0cdb43461cbfe5256183c564937a3277af9ae6dc