Activity bar preference handling fixes. #25564

Job	Run time
setup-selenium / setup_chromedriver	3s
build-client / build-client	11m 6s
Test (3.8, 0)	3m 41s
Test (3.8, 1)	3m 42s
Test (3.8, 2)	3m 42s
	22m 14s

Provide feedback