Merge "Revert "DisplayCutout: Add back always resource"" into pi-dev