Merge "Add null check for rtsp source" into nyc-mr1-dev