am 6af08c6b: Merge "Fix for infinite loop in RemoteViewsAdapter"

* commit '6af08c6b7693b4329184c9cccbc474a0b6a9ea5c':
  Fix for infinite loop in RemoteViewsAdapter