Merge "CEC: Move finishWithCallback method to FeatureAction" into sc-dev