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