Merge "Fix a race condition where the extra view may not update timely."