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

Change-Id: I120be1f1bda0b853fa308d996465ed9e9abfd441