Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev am: 99c319f781
am: d1817707b7

Change-Id: I3284ba15562b3aab4b705e5f1c776a5169d143bd