Revert "Merge active display"

This reverts commit fbbc461f680dc35c65ecf1f734c8d61a48bea07e.