Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev