Merge "Remove Dep.get(MAIN_HANDLER) from NotificationMediaManager"