Fixes in: "Lockscreen Options : Fix toggling of states"

Change-Id: Ie4b84a2ed3d41966a124a81e50cb4eda48e6c506