Merge "Basic support of keyboard focus for multiple windows" into devel/master