Fix FC of lockscreen misc tweaks [1/2]

Change-Id: Icf6402605edf9f22af2fbf724b7a802039e58b31