Merge "Replace bubble settings icon with "manage" text" into qt-dev