Merge "Changed guest_notification_text string" into mnc-dev