Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417 am: be163c055e
am: d7464478ee

Change-Id: I7383890619c9696de358efd4099c7af5b223a5f3