Merge "Resolve NPE on widget.provider.id" into rvc-dev