Merge "Allow QS expansion in switch access mode." into pi-dev am: caa429eada
am: 32966e2ae1

Change-Id: I910f51aa99c993b38c1ff6510672290db3de032a