control bar instream bugs [Delivers #80339570 #78293692 #79635464]