Merge "Add config to skip showing CF fail-to-disable dialog"