Merge "Fine tune Widget library" into sc-dev