automerge: 80a28fe * commit '80a28fe8d69cbf629a6f8cca23de9fc6e7673326': Fix janky in transition doze -> lockscreen