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

Change-Id: Ibc3479934ec0b23252e807a998e88458c7bb4019