Merge "QS edit mode fixes." into pi-dev
am: c6de4240d5

Change-Id: I33179a69d3805e454e04655e8760c8d322d89377