Merge "Revert accidental API change to RemoteViews." into oc-dev