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

* commit 'f013dc41d9ac1e295c91594e6f2ebc1455af5f41':
  Miscellaneous RTSP improvements