Merge "Don't remove allocated player IDs when an app has a  browse service" into rvc-dev