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

Change-Id: I40a6e211fa02a83de09edcfac419b8e78a287e2f