Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev