get rid of null string reference
Notification Shortcuts & WiFi display (2 of 2) - Port from Slimroms

Added notification shortcuts to the notification panel and also the
option to display the current WiFi Network connected to.

Settings placed into following location:
System Settings -> Interface -> Notification Drawer

Two options added Notification shortcuts - This opens the second
preferencescreen with all settings for the notification shortcuts.
Show Wifi network name - Checkbox to enable or disable the Wifi network
name displaying on the notification panel.
Style correction to Notification Shortcut preferences menu, added correct preferencecategory tags on all items so the style matches the rest of the PACman menus.

Change-Id: I909b4581f61c9144da2a87bfc458085810dd6443
Choose Lock Pattern Fix

Smallest correction required to fix the choose lock pattern size display, updated intent to point correctly to --> ChooseLockPatternSize

Compiled and tested with v21.0.0 and working correctly the size selection now displays as it should.