Merge "DO NOT MERGE: Fixed broken aapt2 tests" into qt-dev