Correcting NULL pointer when callerApp is not set

Change-Id: I7252479f4e456aa9da4678dce40f77c60629d469
Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1