Merge "Fix WindowFocusTests#testTapNonFocusableWindow failed" into qt-dev am: de5b1d3805
am: 4f7a7290a0

Change-Id: Iecf416961ad4368de058418db8ec07334004f8bc