Merge "Fix lockscreen.rot_override precedence" into main