Revert "Fix focus issue after calling ClearFocus api"