Merge "Correcting NULL pointer when callerApp is not set" into cm-10.2