Merge "Rename the AnrTimer trunk-stable flag" into main