Merge "Do not allow QS to collapsed when customizing." into pi-dev