Merge "Set focus for each window" into devel/master