Merge "Guard remote volume controllers with a lock" into qt-dev