Merge "Move bubbles top, manage button below" into qt-dev