Merge "Fix cleaning up all persistent preferred activity" into main