apollo: ensure that the current cursor is opened

JIRA: BUGDUMP-21562
https://jira.cyanogenmod.org/browse/BUGDUMP-21562
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: Ib808e074145bf3dfc1686ec32a3168d2e46fc515
(cherry picked from commit 6e66bfd7d86593f858fe4c8b6582d8f3fa896bdb)
apollo: fix typo in sort order key

JIRA: BUGDUMP-21136
https://jira.cyanogenmod.org/browse/BUGDUMP-21136
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: I102e2b9766eed4bf84251789fee87f9008660edc
(cherry picked from commit 43dd5fe06dc15acafdfe41bd445ffcce7734f796)
Merge "apollo: fix typo in sort order key" into stable/cm-11.0