Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am: 8363980d45

Change-Id: Iee12dc78f65a0e4acb09f513fd9578f28f7a5e2e