Merge "Fix QS secondary text color." into pi-dev