am cb68fa5b: am 21a170b2: Fix for stuck widget (issue 6557954)

* commit 'cb68fa5be7794b41e9079666efee4a4303707246':
  Fix for stuck widget (issue 6557954)