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