Merge "Fixing small bug in widget resizing"