We are now using AOSP-ish display modes implementation. Change-Id: Iba9d570dd7cef116e18f3e327c8ab5f5e63f2697
Change-Id: I28ae7907209b5aae9806466556dc49639dd7c9e4