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

Change-Id: Ib0492e3f57c1ff6f04d2a5b1b589855dbf842362