[TF-M] Re: Merging build split feature branch back to main branch