Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev