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