Lockscreen targets: fix NPE when cancelling the shortcut picker
Lockscreen targets: fix icon assignment problems
Remove the save step from lock screen and quick launch shortcuts
WiFi: Fix for SAP turn ON/OFF fails issue.

Turnig ON/OFF SAP repeatedly when WIFI is ON results
in command CMD_SET_AP being received in WifiStaEnabledState
of the state machine, which will not be handled and because
of this SoftAP is not turned ON and we receive no events
thus the check box remains greyed out/disabled.

To resolve this wait for WIFI_STATE_CHANGED intent before
re-enabling the SAP.

Bug: 9576312
Change-Id: Id135cb73d27d54429844da4b58d2da9df9215423