Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev