Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev