Merge "Decoupling PlaybackModel from ActiveMediaSourceManager." into pi-dev