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: 3cb4c159
am: fbc259e0
Change-Id: Ie3a7f42990a48f58573670d4d9e35aa3f262bb57