Merge "DisplayCutout: Move emulation into resource overlay"