Merge "Update shape for all bubbles" into qt-dev