am 60d85e3a: Merge "Fix widget resizes that shouldn\'t (issue 6380435)" into jb-dev

* commit '60d85e3afc9d0e056f9a9153af5565cf74dca9ae':
  Fix widget resizes that shouldn't (issue 6380435)