Merge "DisplayCutout: device-independent emulation overlay"