Merge "Fix CTS failures on the devices with per-display-focus enabled." into qt-dev