Merge "Stabilized the animation when going back from the locked shade" into lmp-dev