Fix custom carrier label

If wifi network label was enabled, it would be replaced by the custom carrier label.

Credits to slim
LockscreenTargets : Dismiss on target select

Dismiss the lockscreen on target select, rather than when the application
is fully loaded. This gets rid of th perceived lag that a lot of users experience.
This is how we had it in previous versions of cm as well.

Change-Id: I4f125ad5a13a95b6eb72734a0fbdc44505d665ff