Merge "Only enumerate display_timing when present timestamp supported" into oc-dev