Merge "Adjust the widgets fitting algorithm to mitigate over packing issue" into sc-dev