Merge "Miscellaneous RTSP improvements" into nyc-dev