Merge "Revert "Do not use notifyAsUser or cancelAsUser""