Merge "Add flag for better support non-match parent activity" into main