Merge "Fix app widget preview layout drag-n-drop & rendering" into sc-dev