Merge "Navigate to more lock screen settings (2/2)" into main