Merge "Do not resolve ACTION_PROCESS_TEXT" into main