Merge \\\"Fixes issue with group backgrounds when animating to keyguard\\\"...
Merge \\\"Fixes issue with group backgrounds when animating to keyguard\\\" into nyc-dev am: 8363980d am: 337c7143
am: e821f6de
Change-Id: Ie5a459ca68b3539ba084e908a4626278271c96e9