Merge "Give focus and input focus at the same time" into devel/master