Merge "Add notification location to onNotificationExpansionChanged."