Merge "Add simulated 4K display modes." into mnc-dev