Merge "Disable "...able to change preferences" browser test"