Merge "Convert HeadsUpEntry statusbar texts to flows" into main