Merge "Prevent double animation of lockicon when waking."