am 7670d3cb: Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev

* commit '7670d3cb2b5d38c60135f34a2446e1ae809d1b32':
  get rid of purgatory and fix QueuesToWindowComposer query