Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev