Merge "New SettingsSecureBoolean and flow" into main