Merge "Refactor and fix MissedCallNotifier"