Merge "Modifying RemoteViewsFactory interface"