Merge "DisplayCutout: Actually reload displays when resource overlays change"