Merge "Add tests of BrowseActivity"