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