settings: Fix warnings

Change-Id: I51fae71c7c4f820aeee0479d89ab873993c02a7a
Merge remote-tracking branch 'cm/cm-12.0' into HEAD
Settings: Fix blacklist settings crash

Change-Id: Idd261aa9f8e2867312aaaece26150671b177994c
Settings: last app action in long press

Change-Id: I72d9cb5bca5eedd20ea80ee69d370a478e59def4
Merge branch 'cm' into HEAD
Merge remote-tracking branch 'upstream/L5' into L5