Merge "Update animations in QS" into oc-dr1-dev am: 497d73f35e
am: 11aba31e55

Change-Id: I466859df9f6b557060bb36eb3878896be438d9d1