Bug 829208 Fix external API build error from bug 807678 r=Standard8
Bug 846762 Private windows should never prompt even if normal windows are open r=IanN