Merge "Ensure lock screen setting is enabled before running the tests" into main