Merge "Add FLAG_ACTIVITY_CLEAR_TASK to the notification Intent" into main