Merge "SettingsGoogle: Add ContextualScreenTimeout" into main