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

Change-Id: I976d3759092830c95baa9c57eba22155fcbd75ab