Merge "Add ECM appOp after UidState is created" into main