Move home & menu unlock to CF

Revert "Settings: Home & menu unlock"

This reverts commit 38f3ff1b997fd5edde8ab92d1738141584a58b9e.

Change-Id: I52eb28543aeb3b23365da5cff12c09f83b6feb58
Merge remote-tracking branch 'upstream/kk' into kk