Merge "Fix logic for use_app_image_startup_cache flag"