Merge "Adds EXTRA_METADATA_TEXT field to Intent" into main