Merge "Fix weird broken state from lock screen -> QS edit" into nyc-dev
am: c98ad64

* commit 'c98ad64e4cccfdea12fe59638e9e04361cc74092':
  Fix weird broken state from lock screen -> QS edit

Change-Id: I09ca286abf62e2a258cdf05c1210cb633c0d3ec2