Merge "Update the setting to use Global instead of secure, deprecate old one" into qt-r1-bubbles-dev