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

Change-Id: I5212af3e21819580c4cfaba0a202a568798e37ed