Merge "QS edit mode fixes." into pi-dev