Merge "Add a feature flag for overwrite confirmation dialog." into arc-apps