Merge "CDD: Clarify navigation requirements for TV" into nyc-dev