Active Display: PS10 and PS11

PS10:
Take care of handling configuration changes when active display
is currently being displayed to the user.

PS11:
Fix refactor derp

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