Merge "Simplify some legacy path of resume activity" into main