Merge "Extend ANR timer to ActiveServices" into main