Fixed Custom Activity Bar Tests (John K, Sam N)
Merge remote-tracking branch 'origin/master'