Merge "Make mapIntentToUri understand meta-data hookup"