Merge "Add use_app_image_startup_cache feature flag"