Merge "omxvts: exit gracefully during fatal fails" into oc-mr1-dev