Apollo: Lock when re-opening cursor

* In certain situations it may be possible to query the cursor
  in a state where it has been closed and not yet re-opened.

Change-Id: I60b19624887bc8ef27b928105a07072e3e11f80b
Merge branch 'cm-10.2' into martincz