Merge "StatusBar: Allow roaming indicator even when also on wifi." into lmp-dev