Bug 888180 - move identity-popup back from popup-notifications.inc to browser.xul, as it's not a popup notification. r=jaws
Bug 888276 - Use hasUses() instead of checking useCount() == 0. r=h4writer