Merge "Adds a start flag to set FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev