fix Phone FC on incoming call

(android.database.StaleDataException: Attempted to access a cursor after it has been closed.)
Merge remote-tracking branch 'revolt/revolt2' into revolt2