Fix: Blacklist menu buttons (add, prefs) were oddly squeezed when entering from CallSettings

When entered from Settings app, add and prefs button were on the bottom bar, but when entered from CallSettings, all 3 buttons were squeezed in the ActionBar at the top.

Change-Id: I92c11f85631484f61857c11f4402e9380b4c081a
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2