Merge "Convert HeadsUpManager et al to use an Executor" into main