Merge "Update QS edit layout." into pi-dev