Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev