cleanup lockscreen interface and security settings.  Move few options
from security to lockscreen misc layout.

Change-Id: I9a781028247e61107476cffc44f859ba648dc068
Signed-off-by: scott <scott@ubuntu>