Merge "Mixer status cleanup"