Merge remote-tracking branch 'origin/fix-import-chrome-bookmarks-windows' into fix-import-chrome-bookmarks-windows

# Conflicts:
#	modules/page_object_prefs.py

Author: Tracy-Walker

modules/data/about_prefs.components.json

@@ -76,6 +76,12 @@
     "shadowParent": "migration-popup",
     "groups": []
   },
+  "password-import-skip-button": {
+    "selectorData": "manual-passport-import-skip",
+    "strategy": "class",
+    "shadowParent": "migration-popup",
+    "groups": []
+},
   "migration-progress-header": {
     "selectorData": "h1#progress-header",
     "strategy": "css",