Merge "Fix QS Edit flashing on exit" into nyc-dev
am: 0f11729d3d

* commit '0f11729d3d2a00f6b32ab1d6b27d98ad58ed4210':
  Fix QS Edit flashing on exit

Change-Id: Ib3c9df33067b0bcacaf7447603cd11aa7a3613e7