Merge "Always process state changes below TOP_THRESHOLD" into main