Merge "Remove FG state check from UCE APIs" into sc-dev