Merge "Revert "Make active device == browsed device, always pause the old active device""