Merge "Resolving a TODO in AppWidgetService" into rvc-dev