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

Change-Id: I4885cf381d1e8b19627cb092cf8c439c50d312ab