Merge "Replace bubble settings icon with "manage" text" into qt-dev am: 37503a0637
am: 2cfb601949

Change-Id: I65d9adb8c9dc7356c71e94f4856e2b605844cf12