Revert "fix circular dependency properly for mpris"

This reverts commit 4bc2a6e12224e71a67cdeb54fbb83de4c469b72d.
Revert "add PlayQueueService circular dependency back to fix hang on unit tests, wha???"

This reverts commit f1488fd204cb9dc5e44fe8f8f6a9d3ae0996cdaa.
Revert "fix circular dependencies when creating xpts"

This reverts commit df081a6e54f249abd7728f96d1f7249197af2d01.
really fix the circular dependencies this time...