Merge "[QS] Tweak tooltip color & shown count" into pi-dev