Merge "Fix "am freeze" for multiprocess apps" into main