Merge "Control the QS label marquees." into pi-dev