Merge "Move key grab implementation to window" into devel/master