Merge "Allow WebViewAppPicker can be launched when dev-option disabled" into main