Merge "Attempt fixing FrameworksImeTests" into main