am d04f864c: am b9eedce2: Merge "Fix lockscreen launch animations once and for all" into lmp-mr1-dev

* commit 'd04f864cae1ae553398774692effb663b73f902c':
  Fix lockscreen launch animations once and for all