Merge "Fix Browser when running on a platform without webview" into klp-modular-dev