Merge "Don't restart when the lockscreen is occluded." into main