Merge "Improve lockscreen launch animations" into lmp-mr1-dev