Merge "Fix status icon reappearing for legacy activities" into lmp-dev