Merge "Make choose lock screen consistent" into main