Merge "Move HeadsUpManager out of NSSL"