Merge "Handle onAppWidgetOptionsChanged widget add" into sc-dev