Merge "Assign cicamId to local mFrontendCicamId when ciCam resource is granted" into sc-dev