Merge "Ensure QS does not expand when qs disabled." into pi-dev