Merge "Normalize toolbar management."