Merge "Fix a lot of OVERLAY_CHANGED broadcasts"