Merge "Set only one remote adapter for RemoteViews" into udc-qpr-dev