Merge "Remove Dependency.get(MAIN_HANDLER) from NotificationListener"