am 9749e335: am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev

* commit '9749e33579a3d27144ac39d9e3572ed30e234039':
  Support 4K overlay displays.