Use ConversationCursor directly in the Controller, and check for null

Fixes b/6357409

Change-Id: I24b6bbbc4d5d5144c13c7568f2c5f0f7999f9808
1 file changed