Merge "Fix QS edit accessibility." into pi-dev