Merge changes I72acc40f,I0a0ce22f into sc-dev

* changes:
  Fix UiTranslationManager ErrorProne error.
  Revert "Revert "Add UiTranslationStateCallback.""