Merge "Lockscreen handle is now a locked icon and not an unlocked"