Merge "Disable flaky testBadApkOnly test." into qt-r1-dev