Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev