Merge "Gating OutOfBoundsException on targetSdkVersion." into qt-dev