Merge "Fix bug where the wrong width was being set on the NotificationPanelView."