Merge "Fix QS edit accessibility." into pi-dev
am: 60ea45eb67

Change-Id: I61ea9750162e4ae33e505614670ddb6227003c36