Merge "Do not use notifyAsUser or cancelAsUser"