Revert "[1/2] Base: ActiveDisplay bugfixes"

This reverts commit b067ae84682a062e4cf935ec4bad23a8952817bf.