Merge "Remove updateImeDisplayId" into sc-v2-dev