Merge "Change bubble settings to use Secure rather than Global" into sc-dev