Bug 934168 - [v1.2] Update browser app and tests to be in line with master