Merge "Fix widget scrolling issue on right panel" into sc-dev