Fix occasionally misplaced error indicators in Buttons (#13723)

Change-Id: Id34a8463ff40b1351d4d8b171e561a21fc76d747