Merge "Fixing expansion state in NotificationPanelViewController" into tm-dev