Merge "Update Notification content description API" into sc-dev