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

Change-Id: I72d03589032791c2c32ca1bb4e94f1bf86467b25