Merge "Update widget suspended layout" into sc-dev