Merge "Refine widgets removal logging" into sc-dev