Merge "Customize lock screen button disappears on rotate" into main