Merge "Create a config flag for the new Screen Timeout settings screen" into main