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

Change-Id: Ia0035037b2726a75f0386dee3e50f22d573a23cc