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

Change-Id: I11607287d3461080aae09b8438c0315c5e6735df