Merge "Disabling strict activity leak check more aggressively than in ag/25340909" into main