Move ActiveDisplay into C-RoM Extras

Change-Id: I2376bd9037abcf34903bce43d893872ab490387d