Merge "Clear old flags more aggressively for POST_NOTIFICATIONS"