Merge "Ensure QS tile secondary text marquees." into pi-dev