Active Display Rework (1/2)

use previous proximity logic with minor fix