Revert "Add lock-to-app to settings"

This reverts commit 315070d58b1d18fe1f5dae73e2ee09fd3ee5b13f.

Change-Id: Id78311a4e0f371a87c975cc97587a404e0dfdb7f
8 files changed