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

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