Fix screen security settings and cleanup

Change-Id: Ie146fc7cdaa0af799ee5df5bd6020f506a95f636