Merge "Allow QS expansion in switch access mode." into pi-dev