Merge "Make accessibility window events more granular"