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

Change-Id: I1364155b6a325653d63c74ab407c787756abb5ca