Merge "Fix failing CTS tile tests" into main