Correcting NULL pointer when callerApp is not set

Change-Id: Ia6570f428141de32d564dd190bbcf93a5d640fd1
JIRA: CYAN-2458
Issue: https://jira.cyanogenmod.org/browse/CYAN-2458
Frameworks : Fix face detection

I337a7a2e8b124aac76f52abcc0edd8af9b0b0e29 introduced
the ifdef's at the wrong location. This patchset addresses it.

Change-Id: I6b19fb96076bdc62b2ca57d1ccaf97f0cb901d67
Fix removal of dock battery views in PhoneStatusBar

removeView is not recursive. Find and remove the dock views from their
direct parent. Fixes inconsistent paddings/margins with the wi-fi
indicator on tablets.

Change-Id: I56745059aaf84b1e52b6a4fd8806481beae0daff
Fix misspelled comment

Change-Id: Id13737b3a40eeee70ec0816aebe551d34ce89691
Merge "Correcting NULL pointer when callerApp is not set" into cm-10.2
Merge changes Id13737b3,I56745059 into cm-10.2

* changes:
  Fix misspelled comment
  Fix removal of dock battery views in PhoneStatusBar
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2