Merge "Fix up QS edit UI"