Merge "Add null check for currentFocusActor" into devel/master