Merge "Avoid configuration of callback being reset after relayout." am: cbcafde45e am: 0170fb8281
am: f98a6f4101

* commit 'f98a6f41019bf41d57d0681c2e1d6859f8704091':
  Avoid configuration of callback being reset after relayout.