Merge "Reduce flakiness of insets test in ActivityRecordTests" into main