Merge "Bubbles handle user switch" into qt-r1-bubbles-dev