Merge "CEC: Move finishWithCallback method to FeatureAction"