Revert "Follow normal lock screen convention - allow user to retry when creating pattern lock"

This reverts commit baf8a0fe685224fe9bbaac0405a764df56fee5c2.
Revert "Settings : Make proximity opt-in"

This reverts commit 0d5338308968a495df2f4fe3417e54b4c85e587f.
Revert "Display settings: reorganize"

This reverts commit 6a2c382dc4aac2a24ed766a6356afcacb6eda6c8.
Revert "Settings: add TouchControl package"

This reverts commit 386b385ea8444f9dddfe42df4de982a37171ffa8.