Revert Quick Unlock option

Change-Id: I6145c53d8b8b8e1d759d44fe413e19b3068676a4