Merge "Add flag for match content frame rate"