Merge "Fix for infinite loop in RemoteViewsAdapter"