Merge "Early return in RemoteViewsAdapter is too late"