Merge "Correct setting the RemoteView's provider id." into sc-dev