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

Change-Id: I99a748be4a74e917f7e17fdf7ad9a7c52d120a0b