Revert "Active display: unregister proximity if pocket mode not used or active display disabled"

This reverts commit 888baa8f349b545b7ec3edb0e5fbee80eafc71ad.