Merge "Use recovery variant for librecovery_ui_ext"