Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea01585 am: 687acec3 am: f2dd477c Change-Id: I95a559770b0f0fca7094a0ea55adfe7a30cf5c59