Merge "Fix CtsAccessibilityServiceTestCases Fail" into qt-dev