Merge "Isolate count of visible window from mirror of uid state" into sc-v2-dev