Merge "Fix DefaultImeVisibilityApplierTest on auto surfaces" into main