Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev