Merge "Return cached data for the Now Playing Queue" into pi-dev