Active Display: Refactor for release

Change-Id: I0f69e0828af1e26cef5e0b043b717d3445a134cd
Signed-off-by: iGio90 <giovanni.rocca.90@gmail.com>