Active Display: Small cleanup

Change-Id: I61298a6a5b848159d9cb5746b54384c1ec06fe9b