Merge "Fix IME TestActivities for edge-to-edge" into main