Merge "hwc: Fix locking on event handling and validation state"