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