Merge "Add FeatureFlag to override notificatin drag"