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

Change-Id: Ib204944c69d8bef3e894e350dd29ef9856eade43