Merge "Fix StatusBarTest's thread check."