Fix everything about NoCutout overlay

Change-Id: I2f8fef113b63b3c868766c0ddeb2b76eb8b0ad12
3 files changed