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

Change-Id: Iafe6cab6b4ef0c2e274a849758a97f084f1314ac