Merge changes from topic "Feedback-UnlockImportance"

* changes:
  Persist automatic setting in long press menu
  Reset notification channel importance