Merge "Miscellaneous RTSP improvements" into nyc-dev am: f013dc41d9
am: 276baf0a4d

* commit '276baf0a4d69d5bd7b48f83ad5d3537a190ece62':
  Miscellaneous RTSP improvements