Merge "Don't abort during app image loading with no boot image"