automerge: 09ba32c * commit '09ba32c0ba9306bafa25e27a2fa7d6e53e9be715': Fix janky in transition doze -> lockscreen