Active Display: fix merge error

Change-Id: I351d4b85efae35ed9f58eb8bfc7b34b813d168f1