Merge "Do nothing when setting focus on same actor" into devel/master