fix(3000): Ensure all scenes work well with the new top bar (#18890)

fix(3000): Ensure all scenes work well with the new top bar (#18890) #3840