Merge "Fixup browser after hidden API refactor"