Merge "Do not check for APEX and APK package name collisions during normal boot" into qt-dev