Merge "Use eventually expect to wait for blocked status change"