Small performance improvements for RTSP
Add missing @Override annotations
Merge remote-tracking branch upstream/$:{upbranch}