Active Display support (1/2)

Change-Id: I12919c3008a2919ef9cc51ad46b114d277538d46
code cleanup

Change-Id: Idc98d484923d437dc2725c3e1e66b6af923c4853