Merge "DisplayCutout: Reload displays when resource overlays change"