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

Change-Id: Ib65d556f261990aae6f4d93e2198c5909cf11733