Merge "Ensure the Bubble settings intent is started as the correct user" into qt-dev