Merge "Remove unused flags from bubble controller" into qt-dev