Merge "re-enable StatusBarTest tests"