Merge "Correct the preview generation for App Widgets." into sc-dev