Merge "Fixed a crash in the Notification expandHelper" into lmp-mr1-dev