Merge "Refactor pinning webview logic to System dependencies" into main