Merge "Disabling strict activity leak check" into main