Merge "Start listening on notifications/QS panels on expansion started" into nyc-mr1-dev