Merge "@Ignore flaky test in QSTileImplTest"