Merge "Partial revert of "Disable StatusBarTests due to flakes.""