Merge "Revert "Lockscreen is invisible"" into main