Notification shorcuts spacing fix

Signed-off-by: iceandfire <arhamjamal@gmail.com>
Remove duplicate if statement

Change-Id: I7a9605815186d1dda79085bffa4250ee7497a5ed
Frameworks: Fix possible NPE

cheers

Change-Id: I9c694a749689b0019df4f1d82f06dc56ee79efc2
Fix possible NPE on tablets

todo.

hide wifi_ssid option in settings when not availabe on sw600dp.
sw720dp works

Signed-off-by: iceandfire <arhamjamal@gmail.com>