Merge "Fix ANR in TouchInteractionService" into main