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

* commit '4bc5054040c84e5d0e97357a30faab30ce4c5441':
  Support 4K overlay displays.