Merge "Hide hotseat when bubble bar is expanded." into main