Merge "Fix shade background not aligning with bottom of a group" into nyc-dev