Merge "Revert "Call SetCurrentFocusActor()"" into devel/master