Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: 687acec369

Change-Id: Ic0c3273debec8afa8d090adf2d98a61b3b034cae