Merge "Fix lockscreen jump-cutting in during screen off." into tm-qpr-dev