Merge "QS edit mode fixes." into pi-dev am: c6de4240d5
am: ca84bcaee6

Change-Id: I2b1412cf3bded51ce6b326d79ad786c392fd7cc7