Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev