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

Change-Id: I8592d033c06f86bbcdd0fe891098b03f1fc2607c