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