Merge "Disables notification drag & drop." into tm-dev